From: Joakim Verona <joakim@verona.se>
Date: Fri, 23 Aug 2013 19:12:05 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4bd3d0459af0b4c8ec3128d0d0d67ff2cbc2750d;p=emacs.git

merge from trunk
---

4bd3d0459af0b4c8ec3128d0d0d67ff2cbc2750d